merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 14 Nov 2006 21:59:37 +0000 (14:59 -0700)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 14 Nov 2006 21:59:37 +0000 (14:59 -0700)

Trivial merge